Apply patch from Nils Barth fixing event return values. (#51041)
authorOwen Taylor <otaylor@redhat.com>
Wed, 28 Mar 2001 04:01:21 +0000 (04:01 +0000)
committerOwen Taylor <otaylor@src.gnome.org>
Wed, 28 Mar 2001 04:01:21 +0000 (04:01 +0000)
Tue Mar 27 22:36:07 2001  Owen Taylor  <otaylor@redhat.com>

* gtk/gtkwidget.h gtk/gtkrange.h: Apply patch from
Nils Barth fixing event return values. (#51041)

* gtk/gtkwidget.c: Fix some return values for default
functions.

* gtk/gtk[vh]scrollbar.c gtk/gtk[vh]range.c: Fix
return values for trough_keys functions.

* gtk/gtkwidget.h (struct _GtkWidgetClass): Fix return
value for add_accelerator (shoudl have been a void
return.)

* gtk/gtkcellrenderer.[ch]: gtkcellrenderertoggle.h:
Fix return type of EVENT.

* gtk/gtkmarshal.list gtk/gtktexttag.c: Make EVENT
signal return a boolean.

22 files changed:
ChangeLog
ChangeLog.pre-2-0
ChangeLog.pre-2-10
ChangeLog.pre-2-2
ChangeLog.pre-2-4
ChangeLog.pre-2-6
ChangeLog.pre-2-8
gtk/gtkcellrenderer.c
gtk/gtkcellrenderer.h
gtk/gtkcellrenderertoggle.c
gtk/gtkhscale.c
gtk/gtkhscrollbar.c
gtk/gtkmarshal.list
gtk/gtkmarshalers.list
gtk/gtkrange.c
gtk/gtkrange.h
gtk/gtktexttag.c
gtk/gtktexttag.h
gtk/gtkvscale.c
gtk/gtkvscrollbar.c
gtk/gtkwidget.c
gtk/gtkwidget.h

index 4ab9d2c8f9e9fc015e5c1f479989f4617e515dc4..7803e1a2f433e3468a8aa5cc872685622e01816d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+Tue Mar 27 22:36:07 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.h gtk/gtkrange.h: Apply patch from 
+       Nils Barth fixing event return values. (#51041)
+
+       * gtk/gtkwidget.c: Fix some return values for default
+       functions.
+
+       * gtk/gtk[vh]scrollbar.c gtk/gtk[vh]range.c: Fix
+       return values for trough_keys functions.
+
+       * gtk/gtkwidget.h (struct _GtkWidgetClass): Fix return
+       value for add_accelerator (shoudl have been a void
+       return.)
+
+       * gtk/gtkcellrenderer.[ch]: gtkcellrenderertoggle.h:
+       Fix return type of EVENT.
+
+       * gtk/gtkmarshal.list gtk/gtktexttag.c: Make EVENT
+       signal return a boolean.
+
 Tue Mar 27 22:07:44 2001  Jonathan Blandford  <jrb@webwynk.net>
 
        * gtk/gtkliststore.c (gtk_list_store_sort): Fix arguments to
index 4ab9d2c8f9e9fc015e5c1f479989f4617e515dc4..7803e1a2f433e3468a8aa5cc872685622e01816d 100644 (file)
@@ -1,3 +1,24 @@
+Tue Mar 27 22:36:07 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.h gtk/gtkrange.h: Apply patch from 
+       Nils Barth fixing event return values. (#51041)
+
+       * gtk/gtkwidget.c: Fix some return values for default
+       functions.
+
+       * gtk/gtk[vh]scrollbar.c gtk/gtk[vh]range.c: Fix
+       return values for trough_keys functions.
+
+       * gtk/gtkwidget.h (struct _GtkWidgetClass): Fix return
+       value for add_accelerator (shoudl have been a void
+       return.)
+
+       * gtk/gtkcellrenderer.[ch]: gtkcellrenderertoggle.h:
+       Fix return type of EVENT.
+
+       * gtk/gtkmarshal.list gtk/gtktexttag.c: Make EVENT
+       signal return a boolean.
+
 Tue Mar 27 22:07:44 2001  Jonathan Blandford  <jrb@webwynk.net>
 
        * gtk/gtkliststore.c (gtk_list_store_sort): Fix arguments to
index 4ab9d2c8f9e9fc015e5c1f479989f4617e515dc4..7803e1a2f433e3468a8aa5cc872685622e01816d 100644 (file)
@@ -1,3 +1,24 @@
+Tue Mar 27 22:36:07 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.h gtk/gtkrange.h: Apply patch from 
+       Nils Barth fixing event return values. (#51041)
+
+       * gtk/gtkwidget.c: Fix some return values for default
+       functions.
+
+       * gtk/gtk[vh]scrollbar.c gtk/gtk[vh]range.c: Fix
+       return values for trough_keys functions.
+
+       * gtk/gtkwidget.h (struct _GtkWidgetClass): Fix return
+       value for add_accelerator (shoudl have been a void
+       return.)
+
+       * gtk/gtkcellrenderer.[ch]: gtkcellrenderertoggle.h:
+       Fix return type of EVENT.
+
+       * gtk/gtkmarshal.list gtk/gtktexttag.c: Make EVENT
+       signal return a boolean.
+
 Tue Mar 27 22:07:44 2001  Jonathan Blandford  <jrb@webwynk.net>
 
        * gtk/gtkliststore.c (gtk_list_store_sort): Fix arguments to
index 4ab9d2c8f9e9fc015e5c1f479989f4617e515dc4..7803e1a2f433e3468a8aa5cc872685622e01816d 100644 (file)
@@ -1,3 +1,24 @@
+Tue Mar 27 22:36:07 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.h gtk/gtkrange.h: Apply patch from 
+       Nils Barth fixing event return values. (#51041)
+
+       * gtk/gtkwidget.c: Fix some return values for default
+       functions.
+
+       * gtk/gtk[vh]scrollbar.c gtk/gtk[vh]range.c: Fix
+       return values for trough_keys functions.
+
+       * gtk/gtkwidget.h (struct _GtkWidgetClass): Fix return
+       value for add_accelerator (shoudl have been a void
+       return.)
+
+       * gtk/gtkcellrenderer.[ch]: gtkcellrenderertoggle.h:
+       Fix return type of EVENT.
+
+       * gtk/gtkmarshal.list gtk/gtktexttag.c: Make EVENT
+       signal return a boolean.
+
 Tue Mar 27 22:07:44 2001  Jonathan Blandford  <jrb@webwynk.net>
 
        * gtk/gtkliststore.c (gtk_list_store_sort): Fix arguments to
index 4ab9d2c8f9e9fc015e5c1f479989f4617e515dc4..7803e1a2f433e3468a8aa5cc872685622e01816d 100644 (file)
@@ -1,3 +1,24 @@
+Tue Mar 27 22:36:07 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.h gtk/gtkrange.h: Apply patch from 
+       Nils Barth fixing event return values. (#51041)
+
+       * gtk/gtkwidget.c: Fix some return values for default
+       functions.
+
+       * gtk/gtk[vh]scrollbar.c gtk/gtk[vh]range.c: Fix
+       return values for trough_keys functions.
+
+       * gtk/gtkwidget.h (struct _GtkWidgetClass): Fix return
+       value for add_accelerator (shoudl have been a void
+       return.)
+
+       * gtk/gtkcellrenderer.[ch]: gtkcellrenderertoggle.h:
+       Fix return type of EVENT.
+
+       * gtk/gtkmarshal.list gtk/gtktexttag.c: Make EVENT
+       signal return a boolean.
+
 Tue Mar 27 22:07:44 2001  Jonathan Blandford  <jrb@webwynk.net>
 
        * gtk/gtkliststore.c (gtk_list_store_sort): Fix arguments to
index 4ab9d2c8f9e9fc015e5c1f479989f4617e515dc4..7803e1a2f433e3468a8aa5cc872685622e01816d 100644 (file)
@@ -1,3 +1,24 @@
+Tue Mar 27 22:36:07 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.h gtk/gtkrange.h: Apply patch from 
+       Nils Barth fixing event return values. (#51041)
+
+       * gtk/gtkwidget.c: Fix some return values for default
+       functions.
+
+       * gtk/gtk[vh]scrollbar.c gtk/gtk[vh]range.c: Fix
+       return values for trough_keys functions.
+
+       * gtk/gtkwidget.h (struct _GtkWidgetClass): Fix return
+       value for add_accelerator (shoudl have been a void
+       return.)
+
+       * gtk/gtkcellrenderer.[ch]: gtkcellrenderertoggle.h:
+       Fix return type of EVENT.
+
+       * gtk/gtkmarshal.list gtk/gtktexttag.c: Make EVENT
+       signal return a boolean.
+
 Tue Mar 27 22:07:44 2001  Jonathan Blandford  <jrb@webwynk.net>
 
        * gtk/gtkliststore.c (gtk_list_store_sort): Fix arguments to
index 4ab9d2c8f9e9fc015e5c1f479989f4617e515dc4..7803e1a2f433e3468a8aa5cc872685622e01816d 100644 (file)
@@ -1,3 +1,24 @@
+Tue Mar 27 22:36:07 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwidget.h gtk/gtkrange.h: Apply patch from 
+       Nils Barth fixing event return values. (#51041)
+
+       * gtk/gtkwidget.c: Fix some return values for default
+       functions.
+
+       * gtk/gtk[vh]scrollbar.c gtk/gtk[vh]range.c: Fix
+       return values for trough_keys functions.
+
+       * gtk/gtkwidget.h (struct _GtkWidgetClass): Fix return
+       value for add_accelerator (shoudl have been a void
+       return.)
+
+       * gtk/gtkcellrenderer.[ch]: gtkcellrenderertoggle.h:
+       Fix return type of EVENT.
+
+       * gtk/gtkmarshal.list gtk/gtktexttag.c: Make EVENT
+       signal return a boolean.
+
 Tue Mar 27 22:07:44 2001  Jonathan Blandford  <jrb@webwynk.net>
 
        * gtk/gtkliststore.c (gtk_list_store_sort): Fix arguments to
index b1c9abe236eacf3e9e0a845800e046693882df70..474275fda7d3e6006067257b337b4d280ec89f7e 100644 (file)
@@ -326,7 +326,7 @@ gtk_cell_renderer_render (GtkCellRenderer     *cell,
  *
  * Return value: %TRUE if the event was consumed/handled
  **/
-gint
+gboolean
 gtk_cell_renderer_event (GtkCellRenderer     *cell,
                         GdkEvent            *event,
                         GtkWidget           *widget,
index 079794a5f738545ee19dbf4cbe8f8943556874e2..7084ba0c54493147734810c5778a1779acdde18d 100644 (file)
@@ -66,53 +66,53 @@ struct _GtkCellRendererClass
   GtkObjectClass parent_class;
 
   /* vtable - not signals */
-  void (* get_size) (GtkCellRenderer *cell,
-                    GtkWidget       *widget,
-                    GdkRectangle    *cell_area,
-                    gint            *x_offset,
-                    gint            *y_offset,
-                    gint            *width,
-                    gint            *height);
-
-  void (* render)   (GtkCellRenderer     *cell,
-                    GdkWindow           *window,
-                    GtkWidget           *widget,
-                    GdkRectangle        *background_area,
-                    GdkRectangle        *cell_area,
-                    GdkRectangle        *expose_area,
-                    GtkCellRendererState flags);
-
-  gint (* event)    (GtkCellRenderer     *cell,
-                    GdkEvent            *event,
-                    GtkWidget           *widget,
-                    gchar               *path,
-                    GdkRectangle        *background_area,
-                    GdkRectangle        *cell_area,
-                     GtkCellRendererState flags);
+  void (* get_size)  (GtkCellRenderer *cell,
+                     GtkWidget       *widget,
+                     GdkRectangle    *cell_area,
+                     gint            *x_offset,
+                     gint            *y_offset,
+                     gint            *width,
+                     gint            *height);
+
+  void (* render)    (GtkCellRenderer     *cell,
+                     GdkWindow           *window,
+                     GtkWidget           *widget,
+                     GdkRectangle        *background_area,
+                     GdkRectangle        *cell_area,
+                     GdkRectangle        *expose_area,
+                     GtkCellRendererState flags);
+
+  gboolean (* event) (GtkCellRenderer     *cell,
+                     GdkEvent            *event,
+                     GtkWidget           *widget,
+                     gchar               *path,
+                     GdkRectangle        *background_area,
+                     GdkRectangle        *cell_area,
+                      GtkCellRendererState flags);
 };
 
-GtkType gtk_cell_renderer_get_type (void);
-void    gtk_cell_renderer_get_size (GtkCellRenderer      *cell,
-                                    GtkWidget            *widget,
-                                   GdkRectangle         *cell_area,
-                                    gint                 *x_offset,
-                                    gint                 *y_offset,
-                                    gint                 *width,
-                                    gint                 *height);
-void    gtk_cell_renderer_render   (GtkCellRenderer      *cell,
-                                    GdkWindow            *window,
-                                    GtkWidget            *widget,
-                                    GdkRectangle         *background_area,
-                                    GdkRectangle         *cell_area,
-                                    GdkRectangle         *expose_area,
-                                    GtkCellRendererState  flags);
-gint    gtk_cell_renderer_event    (GtkCellRenderer      *cell,
-                                    GdkEvent             *event,
-                                    GtkWidget            *widget,
-                                    gchar                *path,
-                                    GdkRectangle         *background_area,
-                                    GdkRectangle         *cell_area,
-                                    GtkCellRendererState  flags);
+GtkType  gtk_cell_renderer_get_type (void);
+void     gtk_cell_renderer_get_size (GtkCellRenderer      *cell,
+                                    GtkWidget            *widget,
+                                    GdkRectangle         *cell_area,
+                                    gint                 *x_offset,
+                                    gint                 *y_offset,
+                                    gint                 *width,
+                                    gint                 *height);
+void     gtk_cell_renderer_render   (GtkCellRenderer      *cell,
+                                    GdkWindow            *window,
+                                    GtkWidget            *widget,
+                                    GdkRectangle         *background_area,
+                                    GdkRectangle         *cell_area,
+                                    GdkRectangle         *expose_area,
+                                    GtkCellRendererState  flags);
+gboolean gtk_cell_renderer_event    (GtkCellRenderer      *cell,
+                                    GdkEvent             *event,
+                                    GtkWidget            *widget,
+                                    gchar                *path,
+                                    GdkRectangle         *background_area,
+                                    GdkRectangle         *cell_area,
+                                    GtkCellRendererState  flags);
 
 #ifdef __cplusplus
 }
index 91199be0ea97a901984421b0d762dface23433f2..3970f3246b0f984c00091e4429a2532e24d5353d 100644 (file)
@@ -46,7 +46,7 @@ static void gtk_cell_renderer_toggle_render     (GtkCellRenderer            *cel
                                                 GdkRectangle               *cell_area,
                                                 GdkRectangle               *expose_area,
                                                 guint                       flags);
-static gint gtk_cell_renderer_toggle_event      (GtkCellRenderer            *cell,
+static gboolean gtk_cell_renderer_toggle_event  (GtkCellRenderer            *cell,
                                                 GdkEvent                   *event,
                                                 GtkWidget                  *widget,
                                                 gchar                      *path,
index 1976acd52faa32138576a3d3df44f0ac38a4c6ea..c09182051b127bbe0c0ec9fc34edc6e10471bd03 100644 (file)
@@ -37,36 +37,37 @@ enum {
   ARG_ADJUSTMENT
 };
 
-static void gtk_hscale_class_init    (GtkHScaleClass *klass);
-static void gtk_hscale_init          (GtkHScale      *hscale);
-static void gtk_hscale_set_arg       (GtkObject      *object,
-                                      GtkArg         *arg,
-                                      guint           arg_id);
-static void gtk_hscale_get_arg       (GtkObject      *object,
-                                      GtkArg         *arg,
-                                      guint           arg_id);
-static void gtk_hscale_realize       (GtkWidget      *widget);
-static void gtk_hscale_size_request  (GtkWidget      *widget,
-                                      GtkRequisition *requisition);
-static void gtk_hscale_size_allocate (GtkWidget      *widget,
-                                      GtkAllocation  *allocation);
-static void gtk_hscale_pos_trough    (GtkHScale      *hscale,
-                                      gint           *x,
-                                      gint           *y,
-                                      gint           *w,
-                                      gint           *h);
-static void gtk_hscale_pos_background (GtkHScale     *hscale,
-                                       gint          *x,
-                                       gint          *y,
-                                       gint          *w,
-                                       gint          *h);
-static void gtk_hscale_draw_slider   (GtkRange       *range);
-static void gtk_hscale_draw_value    (GtkScale       *scale);
-static gint gtk_hscale_trough_keys   (GtkRange *range,
-                                      GdkEventKey *key,
-                                      GtkScrollType *scroll,
-                                      GtkTroughType *pos);
-static void gtk_hscale_clear_background (GtkRange    *range);
+static void     gtk_hscale_class_init       (GtkHScaleClass *klass);
+static void     gtk_hscale_init             (GtkHScale      *hscale);
+static void     gtk_hscale_set_arg          (GtkObject      *object,
+                                            GtkArg         *arg,
+                                            guint           arg_id);
+static void     gtk_hscale_get_arg          (GtkObject      *object,
+                                            GtkArg         *arg,
+                                            guint           arg_id);
+static void     gtk_hscale_realize          (GtkWidget      *widget);
+static void     gtk_hscale_size_request     (GtkWidget      *widget,
+                                            GtkRequisition *requisition);
+static void     gtk_hscale_size_allocate    (GtkWidget      *widget,
+                                            GtkAllocation  *allocation);
+static void     gtk_hscale_pos_trough       (GtkHScale      *hscale,
+                                            gint           *x,
+                                            gint           *y,
+                                            gint           *w,
+                                            gint           *h);
+static void     gtk_hscale_pos_background   (GtkHScale      *hscale,
+                                            gint           *x,
+                                            gint           *y,
+                                            gint           *w,
+                                            gint           *h);
+static void     gtk_hscale_draw_slider      (GtkRange       *range);
+static void     gtk_hscale_draw_value       (GtkScale       *scale);
+static gboolean gtk_hscale_trough_keys      (GtkRange       *range,
+                                            GdkEventKey    *key,
+                                            GtkScrollType  *scroll,
+                                            GtkTroughType  *pos);
+static void     gtk_hscale_clear_background (GtkRange       *range);
+
 
 GtkType
 gtk_hscale_get_type (void)
@@ -540,7 +541,7 @@ gtk_hscale_draw_value (GtkScale *scale)
     }
 }
 
-static gint
+static gboolean
 gtk_hscale_trough_keys (GtkRange *range,
                        GdkEventKey *key,
                        GtkScrollType *scroll,
index af806cd0d86903d283065416f06ec231d56ee921..b66a6883621185d3b3e8ac62a72f491618223266 100644 (file)
@@ -38,25 +38,25 @@ enum {
   ARG_ADJUSTMENT
 };
 
-static void gtk_hscrollbar_class_init       (GtkHScrollbarClass *klass);
-static void gtk_hscrollbar_init             (GtkHScrollbar      *hscrollbar);
-static void gtk_hscrollbar_set_arg          (GtkObject          *object,
-                                             GtkArg             *arg,
-                                             guint               arg_id);
-static void gtk_hscrollbar_get_arg          (GtkObject          *object,
-                                             GtkArg             *arg,
-                                             guint               arg_id);
-static void gtk_hscrollbar_realize          (GtkWidget          *widget);
-static void gtk_hscrollbar_size_allocate    (GtkWidget          *widget,
-                                             GtkAllocation      *allocation);
-static void gtk_hscrollbar_draw_step_forw   (GtkRange           *range);
-static void gtk_hscrollbar_draw_step_back   (GtkRange           *range);
-static void gtk_hscrollbar_slider_update    (GtkRange           *range);
-static void gtk_hscrollbar_calc_slider_size (GtkHScrollbar      *hscrollbar);
-static gint gtk_hscrollbar_trough_keys      (GtkRange *range,
-                                             GdkEventKey *key,
-                                             GtkScrollType *scroll,
-                                             GtkTroughType *pos);
+static void     gtk_hscrollbar_class_init       (GtkHScrollbarClass *klass);
+static void     gtk_hscrollbar_init             (GtkHScrollbar      *hscrollbar);
+static void     gtk_hscrollbar_set_arg          (GtkObject          *object,
+                                                GtkArg             *arg,
+                                                guint               arg_id);
+static void     gtk_hscrollbar_get_arg          (GtkObject          *object,
+                                                GtkArg             *arg,
+                                                guint               arg_id);
+static void     gtk_hscrollbar_realize          (GtkWidget          *widget);
+static void     gtk_hscrollbar_size_allocate    (GtkWidget          *widget,
+                                                GtkAllocation      *allocation);
+static void     gtk_hscrollbar_draw_step_forw   (GtkRange           *range);
+static void     gtk_hscrollbar_draw_step_back   (GtkRange           *range);
+static void     gtk_hscrollbar_slider_update    (GtkRange           *range);
+static void     gtk_hscrollbar_calc_slider_size (GtkHScrollbar      *hscrollbar);
+static gboolean gtk_hscrollbar_trough_keys      (GtkRange           *range,
+                                                GdkEventKey        *key,
+                                                GtkScrollType      *scroll,
+                                                GtkTroughType      *pos);
 
 
 GtkType
@@ -425,7 +425,7 @@ gtk_hscrollbar_calc_slider_size (GtkHScrollbar *hscrollbar)
     }
 }
 
-static gint
+static gboolean
 gtk_hscrollbar_trough_keys(GtkRange *range,
                            GdkEventKey *key,
                            GtkScrollType *scroll,
index 43aabf179d34f6d3721ba60c9f5d1efcdd53981e..1c7b4724022f6913bfb3255eeb604a40931b253b 100644 (file)
 BOOLEAN:BOXED
 BOOLEAN:OBJECT,INT,INT,UINT
 BOOLEAN:OBJECT,STRING,STRING,BOXED
+BOOLEAN:OBJECT,BOXED,BOXED
 BOOLEAN:VOID
 BOOLEAN:BOOLEAN
 ENUM:ENUM
-INT:OBJECT,BOXED,BOXED
 INT:POINTER
 NONE:BOOL
 NONE:INT
index 43aabf179d34f6d3721ba60c9f5d1efcdd53981e..1c7b4724022f6913bfb3255eeb604a40931b253b 100644 (file)
 BOOLEAN:BOXED
 BOOLEAN:OBJECT,INT,INT,UINT
 BOOLEAN:OBJECT,STRING,STRING,BOXED
+BOOLEAN:OBJECT,BOXED,BOXED
 BOOLEAN:VOID
 BOOLEAN:BOOLEAN
 ENUM:ENUM
-INT:OBJECT,BOXED,BOXED
 INT:POINTER
 NONE:BOOL
 NONE:INT
index 766d1ffae9f78326df054bb9efe9ec652ff83a0e..e868031e9398fec71f8642e2c467247628fb9e98 100644 (file)
@@ -391,7 +391,7 @@ _gtk_range_slider_update (GtkRange *range)
     (* RANGE_CLASS (range)->slider_update) (range);
 }
 
-gint
+gboolean
 _gtk_range_trough_click (GtkRange  *range,
                          gint       x,
                          gint       y,
@@ -533,7 +533,7 @@ _gtk_range_default_vslider_update (GtkRange *range)
     }
 }
 
-gint
+gboolean
 _gtk_range_default_htrough_click (GtkRange  *range,
                                   gint       x,
                                   gint       y,
@@ -582,7 +582,7 @@ _gtk_range_default_htrough_click (GtkRange  *range,
   return GTK_TROUGH_NONE;
 }
 
-gint
+gboolean
 _gtk_range_default_vtrough_click (GtkRange  *range,
                                   gint       x,
                                   gint       y,
index 925715b6884a66271c761ac7151d085bc2b2b2b9..4b6127abba83a6e2a3433c050d5f1f1a2541d965 100644 (file)
@@ -97,23 +97,23 @@ struct _GtkRangeClass
 
   void (* draw_background)  (GtkRange *range);
   void (* clear_background) (GtkRange *range);
-  void (* draw_trough)     (GtkRange *range);
-  void (* draw_slider)     (GtkRange *range);
-  void (* draw_step_forw)  (GtkRange *range);
-  void (* draw_step_back)  (GtkRange *range);
-  void (* slider_update)   (GtkRange *range);
-  gint (* trough_click)    (GtkRange *range,
-                           gint      x,
-                           gint      y,
-                           gdouble  *jump_perc);
-  gint (* trough_keys)     (GtkRange *range,
-                           GdkEventKey *key,
-                           GtkScrollType *scroll,
-                           GtkTroughType *trough);
-  void (* motion)          (GtkRange *range,
-                           gint      xdelta,
-                           gint      ydelta);
-  gint (* timer)           (GtkRange *range);
+  void (* draw_trough)      (GtkRange *range);
+  void (* draw_slider)      (GtkRange *range);
+  void (* draw_step_forw)   (GtkRange *range);
+  void (* draw_step_back)   (GtkRange *range);
+  void (* slider_update)    (GtkRange *range);
+  gboolean (* trough_click) (GtkRange *range,
+                            gint      x,
+                            gint      y,
+                            gdouble  *jump_perc);
+  gboolean (* trough_keys)  (GtkRange      *range,
+                            GdkEventKey   *key,
+                            GtkScrollType *scroll,
+                            GtkTroughType *trough);
+  void (* motion)           (GtkRange *range,
+                            gint      xdelta,
+                            gint      ydelta);
+  gboolean (* timer)        (GtkRange *range);
 };
 
 
@@ -135,18 +135,18 @@ void           _gtk_range_draw_slider            (GtkRange      *range);
 void           _gtk_range_draw_step_forw         (GtkRange      *range);
 void           _gtk_range_draw_step_back         (GtkRange      *range);
 void           _gtk_range_slider_update          (GtkRange      *range);
-gint           _gtk_range_trough_click           (GtkRange      *range,
+gboolean       _gtk_range_trough_click           (GtkRange      *range,
                                                   gint           x,
                                                   gint           y,
                                                   gdouble       *jump_perc);
 
 void           _gtk_range_default_hslider_update (GtkRange      *range);
 void           _gtk_range_default_vslider_update (GtkRange      *range);
-gint           _gtk_range_default_htrough_click  (GtkRange      *range,
+gboolean       _gtk_range_default_htrough_click  (GtkRange      *range,
                                                   gint           x,
                                                   gint           y,
                                                   gdouble       *jump_perc);
-gint           _gtk_range_default_vtrough_click  (GtkRange      *range,
+gboolean       _gtk_range_default_vtrough_click  (GtkRange      *range,
                                                   gint           x,
                                                   gint           y,
                                                   gdouble       *jump_perc);
index 938e442f6f3b45a080a7cca8479d630184aaa7c5..58ba7c2b446a2d237953b42128a19f8f38ebedf6 100644 (file)
@@ -605,7 +605,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
                    G_SIGNAL_RUN_LAST,
                    GTK_SIGNAL_OFFSET (GtkTextTagClass, event),
                   NULL, NULL,
-                  gtk_marshal_INT__OBJECT_BOXED_BOXED,
+                  gtk_marshal_BOOLEAN__OBJECT_BOXED_BOXED,
                    GTK_TYPE_INT,
                    3,
                    G_TYPE_OBJECT,
@@ -1616,7 +1616,7 @@ gtk_text_tag_set_priority (GtkTextTag *tag,
  * 
  * Return value: result of signal emission (whether the event was handled)
  **/
-gint
+gboolean
 gtk_text_tag_event (GtkTextTag        *tag,
                     GObject           *event_object,
                     GdkEvent          *event,
index 1511b5452ab5d6a232cc37953d1fb2c3a60629e6..5d5678359791da5b9ce32d7cb91878e5e824a703 100644 (file)
@@ -89,21 +89,22 @@ struct _GtkTextTag
   guint pad3 : 1;
 };
 
-struct _GtkTextTagClass {
+struct _GtkTextTagClass 
+{
   GObjectClass parent_class;
 
-  gint (* event) (GtkTextTag *tag,
-                  GObject *event_object,           /* widget, canvas item, whatever */
-                  GdkEvent *event,                 /* the event itself */
-                  const GtkTextIter *iter);        /* location of event in buffer */
+  gboolean (* event) (GtkTextTag        *tag,
+                      GObject           *event_object, /* widget, canvas item, whatever */
+                      GdkEvent          *event,        /* the event itself */
+                      const GtkTextIter *iter);        /* location of event in buffer */
 };
 
-GType      gtk_text_tag_get_type     (void) G_GNUC_CONST;
+GType        gtk_text_tag_get_type     (void) G_GNUC_CONST;
 GtkTextTag  *gtk_text_tag_new          (const gchar       *name);
 gint         gtk_text_tag_get_priority (GtkTextTag        *tag);
 void         gtk_text_tag_set_priority (GtkTextTag        *tag,
                                         gint               priority);
-gint         gtk_text_tag_event        (GtkTextTag        *tag,
+gboolean     gtk_text_tag_event        (GtkTextTag        *tag,
                                         GObject           *event_object,
                                         GdkEvent          *event,
                                         const GtkTextIter *iter);
index 75dd23d796a7698ca00eb64590373708368cbfcd..8747455093f6b0041ba185c54bf493e1205967c6 100644 (file)
@@ -38,36 +38,36 @@ enum {
   ARG_ADJUSTMENT
 };
 
-static void gtk_vscale_class_init    (GtkVScaleClass *klass);
-static void gtk_vscale_init          (GtkVScale      *vscale);
-static void gtk_vscale_set_arg       (GtkObject      *object,
-                                      GtkArg         *arg,
-                                      guint           arg_id);
-static void gtk_vscale_get_arg       (GtkObject      *object,
-                                      GtkArg         *arg,
-                                      guint           arg_id);
-static void gtk_vscale_realize       (GtkWidget      *widget);
-static void gtk_vscale_size_request  (GtkWidget      *widget,
-                                      GtkRequisition *requisition);
-static void gtk_vscale_size_allocate (GtkWidget      *widget,
-                                      GtkAllocation  *allocation);
-static void gtk_vscale_pos_trough    (GtkVScale      *vscale,
-                                      gint           *x,
-                                      gint           *y,
-                                      gint           *w,
-                                      gint           *h);
-static void gtk_vscale_pos_background (GtkVScale     *vscale,
-                                       gint          *x,
-                                       gint          *y,
-                                       gint          *w,
-                                       gint          *h);
-static void gtk_vscale_draw_slider   (GtkRange       *range);
-static void gtk_vscale_draw_value    (GtkScale       *scale);
-static gint gtk_vscale_trough_keys   (GtkRange *range,
-                                      GdkEventKey *key,
-                                      GtkScrollType *scroll,
-                                      GtkTroughType *pos);
-static void gtk_vscale_clear_background (GtkRange    *range);
+static void     gtk_vscale_class_init       (GtkVScaleClass *klass);
+static void     gtk_vscale_init             (GtkVScale      *vscale);
+static void     gtk_vscale_set_arg          (GtkObject      *object,
+                                            GtkArg         *arg,
+                                            guint           arg_id);
+static void     gtk_vscale_get_arg          (GtkObject      *object,
+                                            GtkArg         *arg,
+                                            guint           arg_id);
+static void     gtk_vscale_realize          (GtkWidget      *widget);
+static void     gtk_vscale_size_request     (GtkWidget      *widget,
+                                            GtkRequisition *requisition);
+static void     gtk_vscale_size_allocate    (GtkWidget      *widget,
+                                            GtkAllocation  *allocation);
+static void     gtk_vscale_pos_trough       (GtkVScale      *vscale,
+                                            gint           *x,
+                                            gint           *y,
+                                            gint           *w,
+                                            gint           *h);
+static void     gtk_vscale_pos_background   (GtkVScale      *vscale,
+                                            gint           *x,
+                                            gint           *y,
+                                            gint           *w,
+                                            gint           *h);
+static void     gtk_vscale_draw_slider      (GtkRange       *range);
+static void     gtk_vscale_draw_value       (GtkScale       *scale);
+static gboolean gtk_vscale_trough_keys      (GtkRange       *range,
+                                            GdkEventKey    *key,
+                                            GtkScrollType  *scroll,
+                                            GtkTroughType  *pos);
+static void     gtk_vscale_clear_background (GtkRange       *range);
 
 GtkType
 gtk_vscale_get_type (void)
@@ -543,7 +543,7 @@ gtk_vscale_draw_value (GtkScale *scale)
     }
 }
 
-static gint
+static gboolean
 gtk_vscale_trough_keys (GtkRange *range,
                        GdkEventKey *key,
                        GtkScrollType *scroll,
index 41d0d8630af891193c0309d8a3c1ab5625599971..9e5e240efd7235554d59c90411add930e6d7748b 100644 (file)
@@ -38,25 +38,25 @@ enum {
   ARG_ADJUSTMENT
 };
 
-static void gtk_vscrollbar_class_init       (GtkVScrollbarClass *klass);
-static void gtk_vscrollbar_init             (GtkVScrollbar      *vscrollbar);
-static void gtk_vscrollbar_set_arg          (GtkObject          *object,
-                                             GtkArg             *arg,
-                                             guint               arg_id);
-static void gtk_vscrollbar_get_arg          (GtkObject          *object,
-                                             GtkArg             *arg,
-                                             guint               arg_id);
-static void gtk_vscrollbar_realize          (GtkWidget          *widget);
-static void gtk_vscrollbar_size_allocate    (GtkWidget          *widget,
-                                             GtkAllocation      *allocation);
-static void gtk_vscrollbar_draw_step_forw   (GtkRange           *range);
-static void gtk_vscrollbar_draw_step_back   (GtkRange           *range);
-static void gtk_vscrollbar_slider_update    (GtkRange           *range);
-static void gtk_vscrollbar_calc_slider_size (GtkVScrollbar      *vscrollbar);
-static gint gtk_vscrollbar_trough_keys      (GtkRange *range,
-                                             GdkEventKey *key,
-                                             GtkScrollType *scroll,
-                                             GtkTroughType *pos);
+static void     gtk_vscrollbar_class_init       (GtkVScrollbarClass *klass);
+static void     gtk_vscrollbar_init             (GtkVScrollbar      *vscrollbar);
+static void     gtk_vscrollbar_set_arg          (GtkObject          *object,
+                                                GtkArg             *arg,
+                                                guint               arg_id);
+static void     gtk_vscrollbar_get_arg          (GtkObject          *object,
+                                                GtkArg             *arg,
+                                                guint               arg_id);
+static void     gtk_vscrollbar_realize          (GtkWidget          *widget);
+static void     gtk_vscrollbar_size_allocate    (GtkWidget          *widget,
+                                                GtkAllocation      *allocation);
+static void     gtk_vscrollbar_draw_step_forw   (GtkRange           *range);
+static void     gtk_vscrollbar_draw_step_back   (GtkRange           *range);
+static void     gtk_vscrollbar_slider_update    (GtkRange           *range);
+static void     gtk_vscrollbar_calc_slider_size (GtkVScrollbar      *vscrollbar);
+static gboolean gtk_vscrollbar_trough_keys      (GtkRange           *range,
+                                                GdkEventKey        *key,
+                                                GtkScrollType      *scroll,
+                                                GtkTroughType      *pos);
 
 
 GtkType
@@ -425,11 +425,11 @@ gtk_vscrollbar_calc_slider_size (GtkVScrollbar *vscrollbar)
     }
 }
 
-static gint
-gtk_vscrollbar_trough_keys(GtkRange *range,
-                           GdkEventKey *key,
-                           GtkScrollType *scroll,
-                           GtkTroughType *pos)
+static gboolean
+gtk_vscrollbar_trough_keys (GtkRange *range,
+                            GdkEventKey *key,
+                            GtkScrollType *scroll,
+                            GtkTroughType *pos)
 {
   gint return_val = FALSE;
   switch (key->keyval)
index 7b95943ec75b08d95de69af4ae04a2fb8bb4c2ab..831e089dc2b282ecfd8efbe0fea92e7cb0c70f3a 100644 (file)
@@ -157,14 +157,15 @@ static void gtk_widget_real_size_request   (GtkWidget         *widget,
                                                  GtkRequisition    *requisition);
 static void gtk_widget_real_size_allocate       (GtkWidget         *widget,
                                                  GtkAllocation     *allocation);
-static gint gtk_widget_real_key_press_event      (GtkWidget         *widget,
-                                                 GdkEventKey       *event);
-static gint gtk_widget_real_key_release_event    (GtkWidget         *widget,
-                                                 GdkEventKey       *event);
-static gint gtk_widget_real_focus_in_event       (GtkWidget         *widget,
-                                                  GdkEventFocus     *event);
-static gint gtk_widget_real_focus_out_event      (GtkWidget         *widget,
-                                                  GdkEventFocus     *event);
+static gboolean gtk_widget_real_key_press_event   (GtkWidget     *widget,
+                                                  GdkEventKey   *event);
+static gboolean gtk_widget_real_key_release_event (GtkWidget     *widget,
+                                                  GdkEventKey   *event);
+static gboolean gtk_widget_real_focus_in_event    (GtkWidget     *widget,
+                                                  GdkEventFocus *event);
+static gboolean gtk_widget_real_focus_out_event   (GtkWidget     *widget,
+                                                  GdkEventFocus *event);
+
 static void gtk_widget_style_set                (GtkWidget         *widget,
                                                  GtkStyle          *previous_style);
 static void gtk_widget_direction_changed        (GtkWidget         *widget,
@@ -2240,7 +2241,7 @@ gtk_widget_real_activate_mnemonic (GtkWidget *widget,
   return TRUE;
 }
 
-static gint
+static gboolean
 gtk_widget_real_key_press_event (GtkWidget         *widget,
                                 GdkEventKey       *event)
 {
@@ -2258,7 +2259,7 @@ gtk_widget_real_key_press_event (GtkWidget         *widget,
   return handled;
 }
 
-static gint
+static gboolean
 gtk_widget_real_key_release_event (GtkWidget         *widget,
                                   GdkEventKey       *event)
 {
@@ -2276,7 +2277,7 @@ gtk_widget_real_key_release_event (GtkWidget         *widget,
   return handled;
 }
 
-static gint
+static gboolean
 gtk_widget_real_focus_in_event (GtkWidget     *widget,
                                 GdkEventFocus *event)
 {
@@ -2286,7 +2287,7 @@ gtk_widget_real_focus_in_event (GtkWidget     *widget,
   return FALSE;
 }
 
-static gint
+static gboolean
 gtk_widget_real_focus_out_event (GtkWidget     *widget,
                                  GdkEventFocus *event)
 {
index 1d5d4bee85c16493629807f421ec6780aa493d23..b6a8032ff6a9fb12caab48e386921ebc8ce5f457 100644 (file)
@@ -260,7 +260,7 @@ struct _GtkWidgetClass
                                GtkTextDirection  previous_direction);
   
   /* accelerators */
-  gint (* add_accelerator)     (GtkWidget      *widget,
+  void (* add_accelerator)     (GtkWidget      *widget,
                                guint           accel_signal_id,
                                GtkAccelGroup  *accel_group,
                                guint           accel_key,
@@ -279,60 +279,60 @@ struct _GtkWidgetClass
   void (* grab_focus)          (GtkWidget      *widget);
   
   /* events */
-  gint (* event)                  (GtkWidget          *widget,
-                                   GdkEvent           *event);
-  gint (* button_press_event)     (GtkWidget          *widget,
-                                   GdkEventButton     *event);
-  gint (* button_release_event)           (GtkWidget          *widget,
-                                   GdkEventButton     *event);
-  gint (* scroll_event)            (GtkWidget          *widget,
-                                   GdkEventScroll     *event);
-  gint (* motion_notify_event)    (GtkWidget          *widget,
-                                   GdkEventMotion     *event);
-  gint (* delete_event)                   (GtkWidget          *widget,
-                                   GdkEventAny        *event);
-  gint (* destroy_event)          (GtkWidget          *widget,
-                                   GdkEventAny        *event);
-  gint (* expose_event)                   (GtkWidget          *widget,
-                                   GdkEventExpose     *event);
-  gint (* key_press_event)        (GtkWidget          *widget,
-                                   GdkEventKey        *event);
-  gint (* key_release_event)      (GtkWidget          *widget,
-                                   GdkEventKey        *event);
-  gint (* enter_notify_event)     (GtkWidget          *widget,
-                                   GdkEventCrossing   *event);
-  gint (* leave_notify_event)     (GtkWidget          *widget,
-                                   GdkEventCrossing   *event);
-  gint (* configure_event)        (GtkWidget          *widget,
-                                   GdkEventConfigure  *event);
-  gint (* focus_in_event)         (GtkWidget          *widget,
-                                   GdkEventFocus      *event);
-  gint (* focus_out_event)        (GtkWidget          *widget,
-                                   GdkEventFocus      *event);
-  gint (* map_event)              (GtkWidget          *widget,
-                                   GdkEventAny        *event);
-  gint (* unmap_event)            (GtkWidget          *widget,
-                                   GdkEventAny        *event);
-  gint (* property_notify_event)   (GtkWidget         *widget,
-                                   GdkEventProperty   *event);
-  gint (* selection_clear_event)   (GtkWidget         *widget,
-                                   GdkEventSelection  *event);
-  gint (* selection_request_event) (GtkWidget         *widget,
-                                   GdkEventSelection  *event);
-  gint (* selection_notify_event)  (GtkWidget         *widget,
-                                   GdkEventSelection  *event);
-  gint (* proximity_in_event)     (GtkWidget          *widget,
-                                   GdkEventProximity  *event);
-  gint (* proximity_out_event)    (GtkWidget          *widget,
-                                   GdkEventProximity  *event);
-  gint (* visibility_notify_event)  (GtkWidget        *widget,
-                                    GdkEventVisibility *event);
-  gint (* client_event)                   (GtkWidget          *widget,
-                                   GdkEventClient     *event);
-  gint (* no_expose_event)        (GtkWidget          *widget,
-                                   GdkEventAny        *event);
-  gint (* window_state_event)      (GtkWidget          *widget,
-                                    GdkEventWindowState *event);
+  gboolean (* event)                   (GtkWidget           *widget,
+                                        GdkEvent            *event);
+  gboolean (* button_press_event)      (GtkWidget           *widget,
+                                        GdkEventButton      *event);
+  gboolean (* button_release_event)    (GtkWidget           *widget,
+                                        GdkEventButton      *event);
+  gboolean (* scroll_event)            (GtkWidget           *widget,
+                                        GdkEventScroll      *event);
+  gboolean (* motion_notify_event)     (GtkWidget           *widget,
+                                        GdkEventMotion      *event);
+  gboolean (* delete_event)            (GtkWidget           *widget,
+                                        GdkEventAny         *event);
+  gboolean (* destroy_event)           (GtkWidget           *widget,
+                                        GdkEventAny         *event);
+  gboolean (* expose_event)            (GtkWidget           *widget,
+                                        GdkEventExpose      *event);
+  gboolean (* key_press_event)         (GtkWidget           *widget,
+                                        GdkEventKey         *event);
+  gboolean (* key_release_event)       (GtkWidget           *widget,
+                                        GdkEventKey         *event);
+  gboolean (* enter_notify_event)      (GtkWidget           *widget,
+                                        GdkEventCrossing    *event);
+  gboolean (* leave_notify_event)      (GtkWidget           *widget,
+                                        GdkEventCrossing    *event);
+  gboolean (* configure_event)         (GtkWidget           *widget,
+                                        GdkEventConfigure   *event);
+  gboolean (* focus_in_event)          (GtkWidget           *widget,
+                                        GdkEventFocus       *event);
+  gboolean (* focus_out_event)         (GtkWidget           *widget,
+                                        GdkEventFocus       *event);
+  gboolean (* map_event)               (GtkWidget           *widget,
+                                        GdkEventAny         *event);
+  gboolean (* unmap_event)             (GtkWidget           *widget,
+                                        GdkEventAny         *event);
+  gboolean (* property_notify_event)   (GtkWidget           *widget,
+                                        GdkEventProperty    *event);
+  gboolean (* selection_clear_event)   (GtkWidget           *widget,
+                                        GdkEventSelection   *event);
+  gboolean (* selection_request_event) (GtkWidget           *widget,
+                                        GdkEventSelection   *event);
+  gboolean (* selection_notify_event)  (GtkWidget           *widget,
+                                        GdkEventSelection   *event);
+  gboolean (* proximity_in_event)      (GtkWidget           *widget,
+                                        GdkEventProximity   *event);
+  gboolean (* proximity_out_event)     (GtkWidget           *widget,
+                                        GdkEventProximity   *event);
+  gboolean (* visibility_notify_event) (GtkWidget           *widget,
+                                        GdkEventVisibility  *event);
+  gboolean (* client_event)            (GtkWidget           *widget,
+                                        GdkEventClient      *event);
+  gboolean (* no_expose_event)         (GtkWidget           *widget,
+                                        GdkEventAny         *event);
+  gboolean (* window_state_event)      (GtkWidget           *widget,
+                                        GdkEventWindowState *event);
   
   /* selection */
   void (* selection_get)           (GtkWidget          *widget,